merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 8 Feb 2011 06:46:05 +0000 (15:46 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 8 Feb 2011 06:46:05 +0000 (15:46 +0900)

Trivial merge